128a2148b770e654424ae77aa092d6bd88ff7e5a,portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java,PortalSiteHelperImpl,pageListToMap,#HttpServletRequest#boolean#Site#SitePage#String#String#boolean#boolean#boolean#,547

Before Change


						desc.append(t.getTool().getDescription());
						tCount++;
						if ( "sakai.siteinfo".equals(t.getToolId()) ) {
							addMoreToolsUrl = Web.returnUrl(req, "/site/" + Web.escapeUrl(site.getId()) + "/page/" + Web.escapeUrl(p.getId()) + "?sakai_action=doMenu_edit_site_tools&panel=Shortcut" );
						}
					}
					// Won't work with mutliple tools per page

After Change


			String pagerefUrl = pageUrl + Web.escapeUrl((alias != null)?alias:p.getId());
			
			String trinity = ServerConfigurationService.getString("portal.inline.experimental", "false");
			if ( "true".equals(trinity) && pageTool != null ) {
				pageUrl = Web.returnUrl(req, "/" + portalPrefix + "/" + Web.escapeUrl(getSiteEffectiveId(site)) );
				if (resetTools) {
					pageUrl = pageUrl + "/tool-reset/";
				} else {